Index: assetmaint/template/PrintFixedAssetMaint.fo.ftl
===================================================================
--- assetmaint/template/PrintFixedAssetMaint.fo.ftl	(revision 1848094)
+++ assetmaint/template/PrintFixedAssetMaint.fo.ftl	(working copy)
@@ -1,3 +1,4 @@
+
 <#--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
@@ -16,7 +17,7 @@
 specific language governing permissions and limitations
 under the License.
 -->
-<#escape x as x?xml>
+
   <fo:flow flow-name="xsl-region-body">
 
     <#-- Print FixedAsset Information -->
@@ -225,9 +226,7 @@
                 <fo:block>Author : ${Static[
                     "org.apache.ofbiz.party.party.PartyHelper"].getPartyName(delegator, note.noteParty, true)}</fo:block>
                 <fo:block>Date : ${note.noteDateTime?string.short}</fo:block>
-                <#escape x as x?html>
                   <fo:block>${note.noteInfo!}</fo:block>
-                </#escape>
               </fo:table-cell>
             </fo:table-row>
           </#list>
@@ -236,6 +235,5 @@
     </#if>
 
   </fo:flow>
-</#escape>
 
 
Index: ecommerce/template/catalog/LayeredNavBar.ftl
===================================================================
--- ecommerce/template/catalog/LayeredNavBar.ftl	(revision 1848094)
+++ ecommerce/template/catalog/LayeredNavBar.ftl	(working copy)
@@ -24,7 +24,6 @@
         <li class="h3">${uiLabelMap.EcommerceLayeredNavigation}</li>
       </ul>
     </div>
-    <#escape x as x?xml>
       <#if productCategory.productCategoryId != currentSearchCategory.productCategoryId>
         <#assign currentSearchCategoryName = categoryContentWrapper.get("CATEGORY_NAME", "html")?string />
         <#list searchConstraintStrings as searchConstraintString>
@@ -32,12 +31,11 @@
             <div id="searchConstraints">&nbsp;
               <a href="<@ofbizUrl>category/~category_id=${productCategoryId}?removeConstraint=${searchConstraintString_index}&amp;clearSearch=N<#if previousCategoryId??>&amp;searchCategoryId=${previousCategoryId}</#if></@ofbizUrl>"
                   class="buttontext">X</a>
-                <#noescape>&nbsp;${searchConstraintString}</#noescape>
+                &nbsp;${searchConstraintString}
             </div>
           </#if>
         </#list>
       </#if>
-    </#escape>
     <#list searchConstraintStrings as searchConstraintString>
       <#if searchConstraintString.indexOf("Category: ") = -1 && searchConstraintString != "Exclude Variants">
         <div id="searchConstraints">&nbsp;
Index: ecommerce/template/content/MiniPoll.ftl
===================================================================
--- ecommerce/template/content/MiniPoll.ftl	(revision 1848094)
+++ ecommerce/template/content/MiniPoll.ftl	(working copy)
@@ -32,7 +32,7 @@
       <form method="post"
           action="<@ofbizUrl>minipoll<#if requestAttributes._CURRENT_VIEW_??>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>"
           style="margin: 0;">
-        ${randomSurvey.render()}
+        ${randomSurvey.render()?no_esc}
       </form>
     </div>
   </div>
Index: ecommerce/template/includes/Header.ftl
===================================================================
--- ecommerce/template/includes/Header.ftl	(revision 1848094)
+++ ecommerce/template/includes/Header.ftl	(working copy)
@@ -21,11 +21,11 @@
     <div class="col">
       <a class="navbar-brand" href="<@ofbizUrl>main</@ofbizUrl>">
           <#if sessionAttributes.overrideLogo??>
-            <img src="<@ofbizContentUrl>${sessionAttributes.overrideLogo}</@ofbizContentUrl>" alt="Logo"/>
+            <img src="<@ofbizContentUrl>${sessionAttributes.overrideLogo?no_esc}</@ofbizContentUrl>" alt="Logo"/>
           <#elseif catalogHeaderLogo??>
-            <img src="<@ofbizContentUrl>${catalogHeaderLogo}</@ofbizContentUrl>" alt="Logo"/>
+            <img src="<@ofbizContentUrl>${catalogHeaderLogo?no_esc}</@ofbizContentUrl>" alt="Logo"/>
           <#elseif layoutSettings.VT_HDR_IMAGE_URL?has_content>
-            <img src="<@ofbizContentUrl>${layoutSettings.VT_HDR_IMAGE_URL}</@ofbizContentUrl>" alt="Logo"/>
+            <img src="<@ofbizContentUrl>${layoutSettings.VT_HDR_IMAGE_URL?no_esc}</@ofbizContentUrl>" alt="Logo"/>
           </#if>
         </a>
     </div>
Index: example/template/reports/BarCode.fo.ftl
===================================================================
--- example/template/reports/BarCode.fo.ftl	(revision 1848094)
+++ example/template/reports/BarCode.fo.ftl	(working copy)
@@ -17,7 +17,7 @@
 under the License.
 -->
 
-<#escape x as x?xml>
+
 <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
 
   <fo:layout-master-set>
@@ -64,4 +64,3 @@
     </fo:flow>
   </fo:page-sequence>
 </fo:root>
-</#escape>